[HVM] Replace hvm_prod_vcpu() with calls to generic (and correct) vcpu_kick().

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c
index c83c2dd92aae75a0ddcdf9b0b2d5fe55bab17170..288cf2724d65ae204435f3d22bba0b5e26655ac6 100644 (file)
--- a/xen/arch/x86/hvm/intercept.c
+++ b/xen/arch/x86/hvm/intercept.c
@@ -260,12 +260,11 @@ int register_io_handler(unsigned long addr, unsigned long size,
     return 1;
 }
 
-/* hooks function for the HLT instruction emulation wakeup */
+/* Hook function for the HLT instruction emulation wakeup. */
 void hlt_timer_fn(void *data)
 {
     struct vcpu *v = data;
-
-    hvm_prod_vcpu(v);
+    vcpu_kick(v);
 }
 
 static __inline__ void missed_ticks(struct periodic_time *pt)

diff --git a/xen/arch/x86/hvm/platform.c b/xen/arch/x86/hvm/platform.c
index d7e63ffa995bf3bcf75170e51b5cbde174864c8f..e52464c0dcbcad4c60e48373c4bf7b8be660e3fe 100644 (file)
--- a/xen/arch/x86/hvm/platform.c
+++ b/xen/arch/x86/hvm/platform.c
@@ -732,13 +732,6 @@ static void hvm_send_assist_req(struct vcpu *v)
     notify_via_xen_event_channel(v->arch.hvm_vcpu.xen_port);
 }
 
-
-/* Wake up a vcpu whihc is waiting for interrupts to come in */
-void hvm_prod_vcpu(struct vcpu *v)
-{
-    vcpu_unblock(v);
-}
-
 void send_pio_req(unsigned long port, unsigned long count, int size,
                   long value, int dir, int df, int pvalid)
 {

diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index 533b6c8237473cf75010e6b9b4d38cc03c021677..8c121ee2c31fb7ae116674118bce294a82481d07 100644 (file)
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -231,7 +231,8 @@ static int vlapic_accept_irq(struct vcpu *v, int delivery_mode,
               "level trig mode for vector %d\n", vector);
             vlapic_set_vector(vector, vlapic->regs + APIC_TMR);
         }
-        hvm_prod_vcpu(v);
+
+        vcpu_kick(v);
 
         result = 1;
         break;

diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-x86/hvm/support.h
index 72b1ca51f4088a68418b4ca7e8ef5d0921e88eab..1c557c228f7d4308d0a04a2d945bc02d2c2539d2 100644 (file)
--- a/xen/include/asm-x86/hvm/support.h
+++ b/xen/include/asm-x86/hvm/support.h
@@ -147,8 +147,6 @@ void hlt_timer_fn(void *data);
 
 void hvm_do_hypercall(struct cpu_user_regs *pregs);
 
-void hvm_prod_vcpu(struct vcpu *v);
-
 void hvm_hlt(unsigned long rflags);
 
 #endif /* __ASM_X86_HVM_SUPPORT_H__ */